bitkeeper revision 1.1159.16.1 (4118eb18njwywlAm0qNOsL9sSbNjjg)

Merge boulderdash.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno-unstable.bk
into boulderdash.cl.cam.ac.uk:/auto/anfs/scratch/boulderdash/gm281/xeno-clone/xeno.bk

diff --cc tools/python/xen/xend/XendDomainInfo.py
index 19f95856cb1bf2ec8f4aaaec95866f500ca591a1,d073909fafba6f126b612835c77c9b55e0fa0423..add98e6448ea59bee7be8eef21747bc273d7dc1c
--- 1/tools/python/xen/xend/XendDomainInfo.py
--- 2/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@@ -698,17 -685,13 +699,18 @@@ class XendDomainInfo
      def init_domain(self):
          """Initialize the domain memory.
          """
 -        if self.recreate: return
 +        if self.recreate:
 +            return
 +        if self.start_time is None:
 +            self.start_time = time.time()
 +        if self.restore:
 +            return
          memory = self.memory
          name = self.name
+         weight = self.weight
          cpu = int(sxp.child_value(self.config, 'cpu', '-1'))
          dom = self.dom or 0
-         dom = xc.domain_create(dom= dom, mem_kb= memory * 1024, name= name, cpu= cpu)
+         dom = xc.domain_create(dom= dom, mem_kb= memory * 1024, name= name, cpu= cpu, weight= weight)
          if dom <= 0:
              raise VmError('Creating domain failed: name=%s memory=%d'
                            % (name, memory))